From: Kenichi Handa <handa@m17n.org>
Date: Tue, 12 Oct 2010 13:06:17 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2669^2~25
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=50d9cc72f2277114d636cb1571a5992d8127901f;p=emacs.git

merge trunk
---

50d9cc72f2277114d636cb1571a5992d8127901f